Clean merge issues.