motify some come
commit
resolve the conflict