modify something unknown
delete code,modify
merge n solve conflict