submit all modification
remove conflict