manually resolving some merge mess with local branches, cheaper picking for screencoords on non-rotated objects