Added different line in /tmp directory.
conflict resolved