fixed merge conflicts
implemented phrase reordering