removed unresolved conflict