fix stlying of tips
merge master