add exercise to fetch and merge
add note about avoiding git pull