fixed unresolved merge conflict