create merge conflict
resolve conflict