Improve diff after merge