Another attempt at merging the orphaned branches