before pull
conflict fixed