new snapshot version
fixed conflicts