B setuko

Title & Confrict fix