fixed repeat bug.
fixed merge