Editing a local file
Fix merge conflicts