keeping branches in sync is suffering