feature a finished
add end line
finish merge remote and local