chore(build): add check for merge conflicts, ddescribe, and iit