Fixes merge conflict left over from clone, initial customization to header