change decision initialization code
resove conflicts