changes after merging