Fix repo folder merge