merging changes from console