Change config
resolved conflicts