Really fix missed merge conflict