add config
fixed conflicts
initial changed
mod