fix conflict bugs