w modify
master modify
conflict fixed