logging changes
merge