removed git conflict marks left in docs/02