finished changes, merging