Fix last merge conflict