really screwy merge trancking behavior, starting over

[SVN r44394]