Fixed commit merge conflict.

The footer of the 1.4 branch displays some leftovers of a git merge conflict. Removed it.