revert false merge changes