Removed merge stuff

Removed garbage from merge.