[Fixed] Corrupt merge