Forgot to commit rest of merge resolution. Git is annoying.