Merge with content branch