Fix failed merge.
Fix failed merge.

ajjl/mlpack,lezorich/mlpack,stereomatchingkiss/mlpack,darcyliu/mlpack,palashahuja/mlpack,theranger/mlpack,theranger/mlpack,darcyliu/mlpack,ajjl/mlpack,lezorich/mlpack,lezorich/mlpack,ranjan1990/mlpack,stereomatchingkiss/mlpack,darcyliu/mlpack,theranger/mlpack,palashahuja/mlpack,ranjan1990/mlpack,ajjl/mlpack,ranjan1990/mlpack,palashahuja/mlpack,stereomatchingkiss/mlpack