Fixed problem with NoneType navdata
fixed merge conflicts