javadoc
added conflict resolution