Removing merge crap. And Added renaming samples