check shape collisions
conflits fixed
reset shape