cleaned up navigation
merge conflict