Removed git conflict markers from documentation