Modify publish process
Fix conflicts