reverted a merge mistake