added presets
merge fixed