merge boot strap form builder changed