conflict resolution

ALL MUSIC FROM conflict resolution