After solved the conflicts.