simple changes - fix merge results