Fixed some auto-merge madness...