Message.java for real
resolving Message conflict