MERGE IS WORKING! (but sometimes stuck)