git url
fix conflicts