Merge branches for synchronization