Add some code to file
Fix merge conflict