remove repo one more time
add local dependency
Merge remote-tracking branch 'upstream/master'