Conflicts manually resolved in:
* styles/fivealive/options/kiwi.css
* styles/fivealive/options/lemon.css
* styles/fivealive.css
* templates/comment/list.tpl
Please revise that your changes in 12.x are properly commited in trunk (my knowledge of bootstrap is minimal).