you will have to actually resolve conflict now on this part. should be trivial.