Fixed shape displaying holes as squares
fixed merge conflicts