detail finish
detail finish merge