MERGE FIX 2