Upgrade gem to aftership api V4
fix conflict
Merge branch 'sharkzp-master'