update merging rules as per last meeting