merging toggle fix