merging changess