still weird merge issues