these are words hellooooooo no way i have added things and you didnt know it!!!!!!

Now i have edited your edited version myself take that

This is a line added in happy branch

<<<<<<< HEAD this is a line added in happier branch

=======

new lines!

happyBranch