fix release build errors
fix restore dependency errors
fix conflict with origin