fix move down two conflicts bug