Moving values to config
resolved conflicts