fixed issues caused by branching
Fix staging errors
fix