Fixed bad merges for ms boundaries