fixing merge conflicts
handling merge conflicts