Javadoc: describe conflict handling for Microkernel.rebase