Resloving Conflicts and adding Service Classes and Exceptions