merge revert 2