Developer branches and branch merging