Previous changes
fixed merge conflicts
Removed extra files