fixed conflicts in duncan.java