fixed conflicts and double checked navigation

commented out buggy code