Removed duplicate files created because of previous merge