Get rid of unecessary files
Remove unecessary files
Resolve conflicts