add simple
& simple
merge and fix conflict