Merge Stefan