merge reverted changes