Managing conflicts in aspect-oriented software - Pryor, Jane L.