Mixed merge conflict
Fixed merge conflict