OK, NOW it works

what a stupid merge... I need to be less obstinate about only using
command line git. What a headache.