Rebuild files after branch merge