changes from merging