fixed classpath
fixed mergeconflict
fixed mergeconflict