Fixed unresolved merge conflicts