nit: remove merge conflict markers