deleted unused files
Resolved conflicts
Updated formatting