Fixed conflict bugs