fix conflicts during merge of Arun's tree