partygoer movement stop when collide with babyRepo
fix merge conflict