Fixed bad auto-merge