Delete .Canvas.hx (tanmarit’s iMac's conflicted copy 2014-11-07).swp