Added a merged particle filter in navigation
solved merge conflicts