removed unresolved merge conflict