more clashes fixed