fix weird merge issues