Actually fixed the conflicts