fixed grammar validations
conflict resolution