Clean up / remove bootstrap conflicts