resolve conflict, should have no errors now