FIX MERGE ERRORS