merging conflicts fixed
testing nav