incorrect approach to finding shapes
fixing merge conflict