bootstrap ready!
fix conflicts