Preparing 1.6.14

Fixing merge conflict