merge: properly remove %n / %N references