create a merge conflict
fixed merge confict