fixed the conflicts
fixed the conflict