remove duplicate after conflict