Merge drama (Bastiaan) fixed