added my configs
merge