Local merge.
Removed extra files