Fix self merge

closes #429