smoothed out issues with merging