370.11 Merging branches and resyncing