Removed git >>>>>>>>>>HEAD
and master shit like this ========
in the middle of our code