fixing merge conflict
modifying merge conflicts