Develop

Deleted conflicting files