resolves some remaining merge issues