Resolved conflicted fiels