temporary repo to debug a dumb merge/branch problem