removed git conflict tags from files
removed git conflict tags from files