issue #1413 It can not be automatically merged, also I fix it in some ot...

...her places