Hello,
Both branches are the same now ... is best to delete the branch deck704, has nothing else to commit, @dyb can double check it later. But conflicts were solve ... now I need to delete this branch.
