merge unmerges changes