Conflict resolved and file merged