Fixed unresolved conflicts