Fix crazy merge conflict