made changes based on data from merge