update repo and fix conflicts