add git completion file
fix conflicts