changed Rectangle to Square
commiting false branch
mergeconflict solved