Merge staging branch