redeclared - merge conflict issues