suro-tranquility is removed
conflict fixed