fixed grammar issues
conflict resolution