BUG: Fixed merge typo