Correcting merge issues