Fix minor git code conflict