Updated post-merge script with bootstrap