Fixed unresolved merge conflict