Fixed unresolved conflicts.