reports added
conflict resolved