MERGE WORKING JEEJ