merge tiny changes