Some bad merge plus a change in scale; ignore .dotsettings