add profile
conflict fixed