navigation super good
conflicts resolved