incremental commit, merge almost working.