restore to default master

can't unmerge what's merged, so let's try a manual diffing to original
state