Fixed issue where @doc and @see weren't included in merge