merging various changes