Reversed useless merge Stuff

merge stuff deleted