Real merge; ignore last commit.