merge conflicts and notes from BA review of tests