Removed conflicted copies caused by dropbox being bad