[Issue #179] [MC] fixes merge conflicts with c1_kareemalirahman_c3s28_addKeywordToProject