Fix several conflict bugs