Removed duplicate files as a result of Merge