bootswatched
fix merge conflict