git merge added a lot of weird code. in my code. hope it is gone now