my conflicting changes