conflict resolved in biomartconnectplugin.java