adding before pulling most recent version
fixing merge conflict