Fix repo after merge