change repo location
Fix merge