what merge conflict? for me everything works fine.