finish merge hard coding