setting
resolved conflict