config issue testing 2
3
conflict resolved