Removed unecessary files
Resolved a conflict