another quick conflict resolved