Now characters can move through own team.
Fixed merge.