more dicking around

aka I can't get your changes until I commit mine fffff