made pass, move, and kickoff tests pass
fixed merge error