corrected the conflicts