Fixing merge revert