Modifications made in anticipation of merge