1.0-SNAPSHOT merge