Got rid of files that were causing conflicts