Convention change of java class
merge with remote