Adding back unmergable files; Teach me how to merge!