remove version conflict error on assign ip
Merge pull request #1289 from control-center/feature/cc-437_2

remove version conflict error on assign ip