Updating paths to reflect changes in merge.