Merge Conflict Resolution

Merge conflict resolution on navigationJPanel