Fixing merge conflicts left in files