BA-BS Conflict Analysis and Resolution Curriculum Map