made an update to config
fixing merge conflict