Removed remains of some merge conflict

There were some lines lingering from an old merge conflict in the static version of the bootstrap files