Make merge return the right alignment even if it's not doing anything.