merging small changes