fixing the conflicts