removing auto-merge <<<<