fix1
finish merge