fixing broken auto-merge
1.2.4