removed random stuff git included

removed bunch of random tags and text that git included when a conflict
occured