these are not the changes you are looking for
resolve conflict