add post course test
handle conflicts
update from local repo