some javadocs for persist, and interface
conflict fix