Fixes commit conflict bugs