- magnets reacting on collision
merging conflicts with master