conflict fixed
added NICResolver.java
Merge origin/master