Correct merge issues