modify Role constructor.
deal with conflicts.
remove unused file.