Resolving merge conflict in makeRenderer.redrawPerArea