feature #1691: Fix error during merge