bad merge, new commit