modify
dd
ddd
df
deal with che conflict