gitskill dev line
add simple
& simple
conflict fixed