Updated deficient square.
Fixed merging issues.