fixing weird merge issues