Just be the merge, the ```@since``` javadoc will be necessary...