removed some files
fixing merge conflicts