Readding files removed from fixing merge conflicts