- solved git merge errors in Perimeter class