branch new line

s
conflict fixed

fixed