Fix merge issues/typo