Fixed unresolved conflict