second add  commonn file
finished  conflict