make changes to setting and profile page
resolve conflict