Fixed the merge problem in navigation.dart