Removed deleted files.
Fixed error in merge