Navigation active style added
Conflict resolution