Adding scope resolution controller functionality
Adding scope conflict resolution to all scopes