udpate btn to btn-default
resolve conflicts for bs3 updates