Added overwrite capability
fixed conflicts