Fising merge conflict