naming convention corrected
conflict resolved