profile update added
theme changed
conflict fixed