Bump
Use SNAPSHOT
Fix merge