profile info shown
conflict fixed