[Fixed] merge issue