manually merged back reverted changes