Removing unneccesary files
Fixing merge conflicts