fixed bug "merge branch"