Does this need to be done before merge?