add skills
add rebase
fix conflicts