intentional conflict
conflict resolcd