fixing auto-merge