user config file pushed, protecting my version
resolved user config conflict