Rolled back merged stuff
Removed extra files
Merged
Reverted all changes