Resolving unmerged files

(Hopefully)