michelle adds some useless bootstrap testing stuff
conflict resolution