Merging current changes