fixed unresolved conflicts.