To make sure
conflict resolved ?