coreected the conflicts