Git merge issues... of course.